From 6fc223da0243fbceb03ad783619ae08fb0d246b0 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 26 Jan 2009 23:35:47 +0000 Subject: [PATCH] x86: Small improvements to mm.c Signed-off-by: Keir Fraser --- xen/arch/x86/mm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 2b54a4f49b..c46f1ffaf2 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -330,7 +330,11 @@ void share_xen_page_with_guest( page_set_owner(page, d); wmb(); /* install valid domain ptr before updating refcnt. */ - ASSERT((page->count_info & (PGC_allocated|PGC_count_mask)) == 0); +#ifdef __i386__ + ASSERT(page->count_info == 0); +#else + ASSERT((page->count_info & ~PGC_xen_heap) == 0); +#endif /* Only add to the allocation list if the domain isn't dying. */ if ( !d->is_dying ) @@ -1946,7 +1950,8 @@ int get_page(struct page_info *page, struct domain *domain) fail: if ( !_shadow_mode_refcounts(domain) && !domain->is_dying ) gdprintk(XENLOG_INFO, - "Error pfn %lx: rd=%p, od=%p, caf=%08lx, taf=%" PRtype_info, + "Error pfn %lx: rd=%p, od=%p, caf=%08lx, taf=%" + PRtype_info "\n", page_to_mfn(page), domain, page_get_owner(page), y, page->u.inuse.type_info); return 0; -- 2.30.2